Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cargo #131421

Merged
merged 1 commit into from
Oct 9, 2024
Merged

Update cargo #131421

merged 1 commit into from
Oct 9, 2024

Conversation

weihanglo
Copy link
Member

8 commits in ad074abe3a18ce8444c06f962ceecfd056acfc73..15fbd2f607d4defc87053b8b76bf5038f2483cf4
2024-10-04 18:18:15 +0000 to 2024-10-08 21:08:11 +0000

This also adds three license exceptions to Cargo.

  • arrayref — BSD-2-Clause
  • blake3 — CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception
  • constant_time_eq — CC0-1.0 OR MIT-0 OR Apache-2.0

These exceptions were added to rustc in #126930, so should be fine for Cargo as well.

@weihanglo
Update cargo
7018a99 
This also adds three license exceptions to Cargo.

* arrayref — BSD-2-Clause
* blake3 — CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception
* constant_time_eq — CC0-1.0 OR MIT-0 OR Apache-2.0

These exceptions were added to rustc in rust-lang#126930,
so should be fine for Cargo as well.
@weihanglo weihanglo self-assigned this Oct 9, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 9, 2024

⚠️ Warning ⚠️

  • These commits modify submodules.

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Oct 9, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 9, 2024

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

Some changes occurred in src/tools/cargo

cc @ehuss

@weihanglo
Copy link
Member Author

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented Oct 9, 2024

📌 Commit 7018a99 has been approved by weihanglo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 9, 2024
@bors
Copy link
Contributor

bors commented Oct 9, 2024

⌛ Testing commit 7018a99 with merge 883f9a2...

@bors
Copy link
Contributor

bors commented Oct 9, 2024

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 883f9a2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 9, 2024
@bors bors merged commit 883f9a2 into rust-lang:master Oct 9, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 9, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (883f9a2): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary 3.3%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 3.3% [2.9%, 3.7%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 774.814s -> 775.847s (0.13%)
Artifact size: 329.56 MiB -> 329.70 MiB (0.04%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@weihanglo weihanglo

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.83.0
Development

Successfully merging this pull request may close these issues.
4 participants
@weihanglo @rustbot @bors @rust-timer